Merge branch 'activate_NONBE_1324_TC_BUFFER_MEMOERY_KEEP' into 'main'

[non-BE] Activate again NONBE_1324_TC_BUFFER_MEMOERY_KEEP

See merge request !2357