branch 'bw_get_impacted_balances' rebased onto develop