Manually merged Ambit3 branch to master