Initial code to support "stamp" content box
Merge