Fix normal trigger mode
Merge remote-tracking branch 'origin/HEAD'

Conflicts:
	Src/Core/AdAcquire.c