my master

I currently diverge bc. of the purging of the `ConstGridProvider`. At some point though (after the publication) I should get back. This is a reminder for me.