Feature/1.40.0.2rc