merge with changes from sprint branch