correction of bad merge / rebase from develop