imfile changes back again, but with retained format
Merge branch 'v7-stable'