applied patch for #191
Merge branch 'hotfix-4.1.6' into support-4.1