Touches from a merge with alchemy's colladadom

Note: this merge is incomplete on our side.