r13672: merge fixes for return valoue and release notes