Merge "Fix a typo (dependant => dependent)" into jb-mr1-dev