merge master with submit script bug fix