Copy of !92 (merged) but then directly to master branch because of the severity of the discovered bug.