Merging ROO-3546 commits