Merge branch 'develop' into improvement/JAL-4111_suffixed_DEVELOP_channels