Branch related to http://issues.gpii.net/browse/GPII-187.