improve textcell with optional metric attribute value.
Merge branch 'fixBugOnTextCell' into develop