1. Revert the fix of ZK-1841 to solve the bug ZK-1947
2. Refix ZK-1841