ADAM / AIAHTML5

Step 1. Update the repo and checkout the branch we are going to merge

git fetch origin
git checkout -b 38018 origin/38018

Step 2. Merge the branch and push the changes to GitLab

git checkout Develop
git merge --no-ff 38018
git push origin Develop