Added previous changes made in AWV Trunk.