fix to 3000

Merged Trần Văn An requested to merge fix/gmcp-port-v2 into main

Merge request reports