Manually merged changes by 1100110