Update: Towards upcoming version 11.5