agnsw layout specific changes
Merging master into agnsw
Merge branch 'agnsw'