Quick check of formatting etc to keep moving
Merge branch 'release/v1.4' into develop