Merge "ios-xe renderer bugfix #2"