Commit before merging
Completed timeboxing for 3.2