Merging Next --> Main (#982) (#983)

Merging Next into Production

Things changed-
- Manual data enter – handling template statistics.
- Manual data enter – increased SubOS (subscription) count and applied
charges.

Author: thisismayuresh