Release/6.9.4 See merge request !78
Feature/0515 See merge request !79
fix report See merge request !77
Feature/0515 See merge request !76