Gpii 803

http://issues.gpii.net/browse/GPII-803
@jobara yes