Fix
#18965 New feature used only on modals with select2 included
#18965 Fixed bug
Merge branch 'i18965' into development