VOL-36 - This file is now included by core