Merge updates from main vylight.