Merge Apr 24th deployment version.