WIP - Honor i18.CommitEncoding

Fix #530