Merge branch 'v2.0'

Signed-off-by: velandy <rajesh.velandy@riftio.com>