ROO-3505: Solving problems with commands after migration to Felix 4.4.1