Issue #90: using selected level
Merge branch '3.1.x'