changes to when selectors is bound
merged upstream
mis-merged