Merge branch 'develop' into patch/JAL-4281_idwidthandannotHeight_in_project