Issue #3428682 by VladimirAus, jannakha: Bring latest changes from starter kit: from 10.1.2 to 10.2.4