ROO-3505: Solving errors after move to Felix 4.4.1