Pull request from 2.9.2 (Goga/Igor)