Implementation of issue #KT-4076