Merge "Fix caption rendering" into klp-dev