Commits on Mar 20, 2018

1. Fix for GH-877, GH-886, GH-872.

   Serge Zarembsky committed Mar 20, 2018
   bdcba81

2. Merge remote-tracking branch 'upstream/develop' into develop

   Serge Zarembsky committed Mar 20, 2018
   765f56d

3. Removing log from manifest

   Serge Zarembsky committed Mar 20, 2018
   95b400f

4. Added return after reject.

   Serge Zarembsky committed Mar 20, 2018
   636c05c