Code

- Added patches from LHM commit r15602 Closes #850