SDP including hydropower objective

SDP including hydropower objective and other improvements taken from DP