Merge branch 'develop' into tasks/JAL-3311_removeVamsasMenu