4335 pull from staging

could merge in my branch and grab the CREATE statement from the collection module if you fancy?