Merge demo sprint 2