-Final tweaks for submission process for 1.7. See #272