Merge "Support Ellipsis Position Property" into devel/master