Merge branch 'dev' of https://github.com/AmazeeLabs/silverback-templa…

Merge branch 'dev' of https://github.com/AmazeeLabs/silverback-templa… #1848