Merge with master
Fix conflict for update desired capabilities fix