* moving ce changes from ent pr * add changelog * Update changelog/31422.txt Co-authored-by: Amir Aslamov <amir.aslamov@hashicorp.com> --------- Co-authored-by: Amir Aslamov <amir.aslamov@hashicorp.com>