Bring master up to date with some changes to legacy