Merge remote-tracking branch 'john/John/release-2.18.2/SCRM-4919' into John/release-2.18.2/SCRM-4919

# Conflicts:
#	src/main.js
#	src/utils/index.js