(cherry picked from commit c4fb0e9) #KT-11395 Open
(cherry picked from commit d0ffe06) #KT-11395 Fixed