Resolves #192: consistency improvement
Merge branch 'v2.x-maint'