https://issues.griddynamics.net/browse/JFG-674