merge WIP #1521