RA-395: fixing scopes of dependencies