[development] Let's wander back to topic: bug fixing and reviewing