Controller margin adjustments from Gravitas updates
Merge branch 'refs/heads/master' into test