Resloves JIRA: http://issues.gpii.net/browse/GPII-293