Final commit before release (2)