Merge "Revert "Revert submission""