Merge "Introduce Forward Override Options for the stable config" into 24D1-dev