Move relavent commits from master to 2.1.1