fixed select/combo dynamic loading
Merge remote-tracking branch 'origin/master' into master-real