Merge "Remove unneccessary restriction" into main