Modifications in preparation for 2.11.0-M8

Supersedes #30