Merge "Set visibility on class properties for *Dependency classes"