Merge pull request #5985 in master
Merge branch 'hotfix/#5863-method-signature-cleanups'

Close #5863
Removing unused import causing builds to fail
Merge branch 'hotfix/unused-code' into develop