Merge "Move Block 23 flag back into its section" into udc-dev