Sync change log with fixes made in 2e5c4fe4575f411e4a6683fb313509708a8a596a