Improved stability, error management and concurrency control.

Change-Id: I90b1b73aca51e18c7f2d45801f7a43c163a3f1cb