Merge "Fixing SVACE error on 3rd party template" into devel/master