Merge "Add assist content admin control" into main