Merge "Fix privilege issue for hybrid" into devel_3.0_main