Merge branch 'patch/JAL-4213_addref_with_selection' into develop