Took 52 minutes

(cherry picked from commit 472e07849a9e61a1aef3db772a1741b4edcd4493)

Took 3 minutes