Merge branch 'tests/#5948-circular-dependency-tests-for-module-manager-init'

Close #5948
NumberOfParameterFilter correctly handles argument count greater than zero.
Return boolean instead of if statement.
Cleaned up annotations for tests of #6083
Merge branch 'hotfix/#6083-hydrator-number-of-parameters-filter-honored' into develop

Close #6083
Forward Port #6083