Merge branch 'logo_feature_JAL-958' into develop