Merge branch 'refs/heads/t/afh-preserve' into next