cc @brson, just confirming this is ok