Merge branch 'checkptsstyle' into develop