Merge "Replace mDeps with a custom object"