Brining support branch up to date with hotfixes.