Merge branch 'spike/try_spotless_JAL-3438' into develop