Bug fixes to the maintenance applications
Merge with remote master