initial implementation of #1154