latest SDP
Merge branch 'origin-master'
merge of diverged mas