#1447 - working on wrappable template