merge changes in MAC platform