Test and fix related to #138
Merge branch '2.3'