Adding commits from 0.07.