pull in ayanko's change to support merging of settings and make it work again with the newest settings logic.