Merged sdepold-master