Merge "Fix sonars in policy models"