Switching hr_layout to the feature/contactsid branch.