Merge branch 'feat-templateDetails' into dev