This was implemented and tested on production on 2019-08-05
