Fix merge conflicts with release/2.1

Issue #2256