Merge "DO NOT MERGE Fix assertion to use complete load check rather than one flag." into jb-dev