Revert "Merge branch 'master' into development"
Revert "Merge branch 'master' into development"

This reverts commit 6ea9528597771aa32c0321efb33c0e9226b6ec7a, reversing
changes made to 7a5382a1027eb96aa15d1226a7db041db05a0069.

colinPlusPlus/Opus-Energy,colinPlusPlus/Opus-Energy,colinPlusPlus/Opus-Energy