Merge "Remove flexiglass dependency from repository that is used by existing code" into main