This MR focus on fixing issues reported on ICSHWI-9223. In special those related to changing the equations;