Merging Bank Service functionality with latest Master