Branch 1.0.0 rc5 - KIJIMR-145

Reverts wrong KIJIMR-145.
Reapply latest KIJIMR-145.