changes for new SDK (scrivito-0.30.0.rc1), some minor tweaks