Merge changes Ied2efcf6,I07579635 into main

* changes:
  Polish workFAB with updated spec.
  Fix workFAB alignment.