Merge branch 'devel' into anotherfix_assocReq