Merge branch 'sdc-2i-timeout' into 2.0-stable
Bump to 2.0.2.
Merge branch '2.0-stable'