V4.5.8 commit

Bring all patches up to date