Merge "Fix the ooperational policy ui issue"