Merge "Framework/base: Added synchronization block to avoid race condition"