Minor update regarding the new framework.
Authored by: debug 2019-05-02
Parent: [r6169]
Child: [r6171]
