as commits up to 8c1348e4f2adb1c6cf1ebf05b624322a138c6df5.

Thanks for the patches!