Merge branch 'main' into 2084-fix-fp-leftovers-IVAS_ENC_FeedObjectMetadata