PFS-1121 #resolve
Minor performance fix