Comment 1 for bug 1664958

Due to necessity to backport a big amount of refactoring changes for fixing non high or critical bug.
Recommend to use workaround to avoid this problem