Shayan/forceon 0.4.5

To be merged into 0.4.5.