Temporarily comment out content listing admin as it requires permission that we will not set for editors
Merge remote-tracking branch 'origin' into release