3 Commits (CLDC-3851-refactor-depends-on)