Merge branch 'pm_phase2' into v2.0

Signed-off-by: sinhan <nandan.sinha@riftio.com>