Merge "Changes for vogar compatibility"