Solved issue CYAN-3059