[master] Add amortized return