Merge branch 'hotfix-1.12.3'
Use nodes contactblock if none else. @yani
Merge branch 'hotfix-1.12.4' into develop