SDPIII-48 Merge conflict resolved