4.2.3

 Merge branch 'KWFS-664' into release_4.2.4  Maksim authored 3 weeks ago a93218b4 

4.2.2