MSS-94 php 5.3 fix
Merge branch 'feature/MSS-94' into feature/CF-370