$ 0 0 *MERGE* Merge the latest trunk enhancements into main reuse-schema branch. (tags: reuse-schema)