Re-merging in Pull Request #2 as a separate branch