Manually copied over files that didn't get merged over from ansible branch