ROO-3505: Applying master changes