Merge master back into dev v2.1.0#1001

artoonie wants to merge 6 commits into

developBrightSpots/rcv:developfrom

masterBrightSpots/rcv:masterCopy head branch name to clipboard