riot
master
Ref: #1007 #1004 (need changes if this is merged) #840 (some discussion on the concerns).