Created a JIRA for this,
http://issues.gpii.net/browse/GPII-633