Fix that annoying bug introduced by upsert + add changelog entry