Merge "Make MoreOptionsScope abstract class" into main