Merge pull request #351 from jpadula2014/optaa_dj_cspp

CIDEVMI-1401 Optaa dj cspp
Merge remote branch 'upstream/master' into optaa_dj_cspp