Register legend controllers for sdiff (fixes tests)
Merge remote-tracking branch 'origin/master'