Merge "Align default implementation with latest VSR."