[Sync] Sync master to feature/dynamic-protocol-state
#4578
Merged
feature/dynamic-protocol-state
#4578