Merge remote-tracking branch 'origin' into fix-issue26