Merge branch 'develop' into feature/JAL-3576intervalStore_1_2