Merge "Expose Image and Plane for testing"