Merged gbdk-294 branch