Uc91.2 See merge request !4
Uc91.1 See merge request !3
Fixed failing unit tests and selenium tests See merge request !1