merged in 569944efe9df65ba2704c524c29a145f722632d2
merged in d6a156107df99ceae6b3c85447764712a8fe0684
Merge branch 'develop-frontend' into feature/VUMIGO-202-integrate-base-template