Changes following comments

Signed-off-by: Benoît Burnichon <bburnichon@gmail.com>
Add OrderItemSpec for merge

Signed-off-by: Benoît Burnichon <bburnichon@gmail.com>