mods to continue integration script

Signed-off-by: Reza Akhavan <reza@akhavan.me>
Merge branch 'master' into integration

* master:
  mods to continue integration script