1.99.2 preparation
Fixes #1135