Merge "Change order of operations so flag is not overwritten" into klp-dev