Request from issue #1132. Now in the core.