minimal release note update
merge trunk