*8148* Submission step 1 porting continues