Final commit before sending 2.7.0 to Apple store