MDL-36908 Assignment: Additional fixes for preventing empty submissions