merged with upstream
Merge remote-tracking branch 'upstream2/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
fixed #706
removed alert
fixed #706 : removed .then line from code
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into notebook_suffix
Merge branch 'pr/804' into develop