Merge branch '387-ism-metadata-discontinuity-in-fec' into 'main'

[non-BE] Issue 387: fix MD discontinuity in ISM FEC; under FIX_387_ISM_MD_FEC

See merge request !526