Merge feature/protocol-state-kvstore
to master
#5840
Merged
feature/protocol-state-kvstore
to master
#5840