Merge pull request #7988 from nabinhait/develop

Multiple version 8 fixes