TD-3791
Changes roll-back