Fix more ADV/ADVP errors
Merge branch 'adv-advp' into pradet-fixes

Conflicts:
	split-23.2.xml