Merge branch 'main' into basop-2490-harmonize-fdcng_encodesid_-_fx