Merge branch 'improvement/JAL-4111_suffixed_DEVELOP_channels' into development/Releas...