Merge most recent changes from VVV main.