CONN-355: Fixed the Policy Engine issues