Merged branch subtype-trunk into default.