Case 3209 - Minor speed optimizations.
Merge branch 'case-3209' into develop

* case-3209:
  Case 3209 - Minor speed optimizations.