Basic block image (figure/figcaption) support

Change-Id: Iddb3a5f57fd0ab965db00c2b148ab4f5e89b923d
Merge "Basic block image (figure/figcaption) support"