Merge "Implement getSafeAttributes for other objects" into feature/zuulv3