Fixing merge for sylvia's branch bpd-615

Fixing merge for sylvia's branch bpd-615