intellidemand v4: after-merge build fix