DDBEASY-246 - Addiotional upsteam merge fixes.