Merge "Fix #2474554 (After meeting policy req's, no sync)"