Added lazy parameter injection + tests, needs integration tests
Added parameter lazy injection tests + bugfix
Merge remote-tracking branch 'origin/3.1' into 3.1