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