work on #412
manual merge