Merge "Remove code smells in PolicyController"