Merge branch 'fix/awhitening'