Cycles baking normal map displacement

Hi all,
When I bake normal map in Cycles it doesn’t take into account material displacement or bump just mesh geometry. I think BI does this automatically, can it be enabled in Cycles? Thanks.