encapsulated template note
Merge branch 'pr/510' into develop