Stop populating meta-data from routers in previous template config
Merge branch 'release/1.1.4' into develop