Merge "Unhardcode allow_expired_window directive" into release/2019.2.0