The identity of the calcium-storing, inositol 1,4,5-trisphosphate-sensitive organelle in non-muscle cells: calciosome, endoplasmic reticulum ... or both?

The identity of the calcium-storing, inositol 1,4,5-trisphosphate-sensitive organelle in non-muscle cells: calciosome, endoplasmic reticulum ... or both?