Do NOT require restart app.
Some inlining.