Fixes Issue 10468 - Remove ref from parameter type in lockstep, which caused a regression.
Remained one for 313 & 314
Merge pull request #1370 from AndrejMitrovic/Fix10468

(Regression 2.063) - Issue 10468 - Remove ref hardcoded from parameter type in lockstep
Merge pull request #1373 from 9rnsr/fix_imports

Remained one for 313 & 314