Case 3948 - Made BPI materials mapping optional.
Merge branch 'case-3948' into develop

* case-3948:
  Case 3948 - Made BPI materials mapping optional.