Merge branch 'features/JAL-1759jmolUpdate' into develop