Merge pull request #1671 from anilgooru/dev-branch

Dev branch
Fixed miss match with service and async classes.