merge of 'wip' to prepare version 2.1.0-alpha