Fixes #2608250: Replace !placeholders
To coincide with 8.0.0 rc1
Fixes for latest 8.x HEAD
New releases after _content » _controller