allow for follow types
Merge commit '0478e7ff32226a97b1a1b27e467b5d3324094733' into pebble_follow