[MOD] re-applying changes from release/next
.. all unit tests passed