RA-395: fixing scope of dependencies