Merge branch 'awhitening'