Merge "Added resolution to SubscribeOptions." into main