Merge "Prerequisite changes to switch to 6.1 kernel" into main