Merge branch 'hotfix/assests-compile-gem'
Updated gem lock
Merge branch 'hotfix/update-gem-lock' into develop