Backport changes from Aramur.github.io.