Merge accumulated fixes to prepare for 1.7.0.3