Fixed merge conflicts
Merging origin/jye/master-pending-inputselect-initConsistency into master