Merge branch 'hotfix/#6781-add-missing-hash-algorithm-constants-for-salted-derivation-key'

Close #6781
Bug in PriorityList
Merge branch 'hotfix/#7008-revert-#6989-self-reference-in-non-static-context' into develop

Close #7008
Forward port #7008