Merge "Add filter by container to aflags" into main