Add some missing commits from the dev branche.