[General] Needed commit to proceed with the merge v2.0