Healing histories tweak.
Merge branch 'dev'