Merge "Address VRI review comments"