Merge "Add @since tags to Collation stuff"