Merge pull request #895 from spbnick/v2.x.x_misc_fixes