merged from unreleased