Enforce ASO/Couch communication reliability.
Merge pull request #4198 from HassenRiahi/EnforceReliabilityASOCouch

Enforce ASO/Couch communication reliability.