Merge branch '3694_hex_pattern_parsing'