Merge "Enable System User Home for CSI" into rvc-dev