Suggestion from MPR6 was approved by Bernat - August 14, 2022

Suggestion from MPR6 submitted for review - August 14, 2022