Release3 updates

overdue commits for release 3