first for aov
Merge commit '2cf715b656e48142d21be2bc19efb34ab710cb4c'

Conflicts:
	v1.txt