Updates from PR
Updates from PR

kbase/narrative,briehl/narrative,briehl/narrative,briehl/narrative,kbase/narrative,kbase/narrative,briehl/narrative,kbase/narrative,kbase/narrative,kbase/narrative,briehl/narrative,briehl/narrative,briehl/narrative