Remerged past commits that were lost:
fa96f0235896704e80c438ab6b3c3a3a0079d9d9
870d3ebec3e9fe25fe2c5658e948df43c4f4ba83
79cd795b782995f02b3159a4055526d1e40e52e2

Fixes #144