Backport of #2723 and (part of) #2136 for April global run

This pull request is to backport in 70x the changes in #2723 and #2136 which are needed for the April global run