903000 - Fix for missing params checking on System Templates
Merge pull request #1460 from knowncitizen/903000

903000 - Fix for missing params checking on System Templates