Gpii 736

http://issues.gpii.net/browse/GPII-736