Merge "Get rid of unnecessary policy file saves" into qt-dev