fixes for task 22157