Merge "[elm] add shots feature from upstream"