Merge tag 'rel/2.1.0'

Release 2.1.0