Committing merge from Mike's case.