One issue with this:

Before we merge, we have to decide if we either bump the required cms version or remove the super call from here.