Merge branch 'hotfix/1.9.8'
Merge branch 'release/2.0.0'
correcting base_url mistake.

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Merge branch 'hotfix/2.0.1' into develop