recovery. Contributed by Bibin A Chundatt (cherry picked from commit 22dc5fc20942a8d98333ed5470b5fb8c1d257f1a)