updated and merged with Team-Hydra

Change-Id: I9061c065e5969afda06d0270edee5a28dc61d97b