NXP-11036: make sure we have the same behaviour when using dev mode or not