LP#1066326: use internal flags; sync with master