Modified for Spring 3.2.1 upgrade.
DevSynch