Merge "Remove NativeImage Usage" into devel/master