Merge "Fix DefGrantPolicyTest" into qt-dev