Merge in latest changes from the 3.x app tree
Updated the cell template to add a title.