WITH_CONTENT_SCAN checkin - compiles OK now