Merging branch changes: added Master-Foreman Relations