Merge "Fix build error: unused variable 'BoringBits'"