Merge "Fix ellipsis cache issue" into devel/master