Implemented issue #254299