Lifted change entry from 0.22, got the branches all mixed up