Final sync: Ensure all intelligence and formatting fixes are pushed

d6ca65c