Re-prepare bugfix iteration towards 0.1.7