ZEN-58: Implement changes recommended by Sensio Insight