Deprecating the Placeholder singleton registry
Missed on place that the placeholder registry is unset
Merge pull request #3979 from SocalNick/zf3978

Fixes #3978
Merge branch 'feature/3979' into develop

Close #3979
Fixes #3978