Merge "Resolve policy GUI access from Portal"