Merge "Fix 2 issues related to caption."