mergeable PR. Supersedes #54