Merge remote-tracking branch 'origin/feature-143-support-enterprise-linux-7' into develop_integration_w22