#1509 Updated to resolve conflict