Committing hotfixes

Commit all uncommitted hotfixes to make the hotfixes a permanent part of the system.

You cannot roll back committed hotfixes.