Merge tag '0.15.2' into develop

Released 0.15.2 0.15.2
maintain available template keys
bumped version
Merge branch 'release/0.15.3'