Update for 2018.12 stable release