Changes related to handling multi-plane images more gracefully