Merged in #2.3.0 to master