merged gns-61 into dev