Merge "registration: Improve dependency checking"