Merge changes from M66B