Close 6.0.0-LegacyApi-Refactor branch