Merge "Use the orientation from the config object not resources"