Latest fix for ContentBundle