(Also, 100677 predated my previous commit, and though I unwittingly didn't use it, credit to the submitter). PR: 100677 Submitted by: Jin-Shan Tseng <tjs@cdpa.nsysu.edu.tw>