Fixed rebase error
Added new gold file
Added new goldfile
Merging origin/jye/master-pending-inputSelect-dynamicSetFix into master