6/18/2022 - update to upstream version 1.2.60