Dynamic content support & reinit
(cherry picked from commit d340d9e)