Merge branch 'spotless_2' into JAL-1551_2_11_3_spotlett