Created by: masahisak
This pull request includes the fixes to align with the latest SCP-firmware design.