Merge "Add support for span tag" into devel/master