Merge "Fix svace issue at control/text-anchor-impl" into devel/master