Changes as listed in pull request discussion