Merge "Enable System User Home for CSI"