fmeum:18393-fixed-invocation-id-support