JBIDE-17254: Luna M7