New architecture, 11.2 compatibility

UPDATED: new architecture
UPDATED: 11.2 compatibility
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.asp