EMBRYO-316, EMBRYO-404: fix to avoid cross origin problems