Revert to 781ab2ab7bf13ba5650648bcc2aacca889bf4d38
Merge branch 'master' into mc_cpp

converting mc_cpp branch to master, everything is working