Merge pull request #4961 from pratikshad/core-bugs