Merge "Fix issue #36858643: Runtime restart on OPR1.170323.002" into oc-dev