Merge "Add default implementation to handle master dev option switch."