Gns 11 20

Contains fixes for the following:
 * GNS-11
 * GNS-12
 * GNS-13
 * GNS-20