Merge "Updates for NativeImageInterface" into devel/master