Merge "Fix issues in Operational Policy UI"