Fixed setting initial request after refactoring, solves #1941
Merge branch 'issue/1941' into develop