Merge master into no_force