2014 SDP updates
resolve merge conflict