Merge branch 'develop' into bug/JAL-147scrollWrappedView