Megred 17x changes to master