manual merge of the distrib/ part from a prerelease of 0.30.215