Merged cap bank fix from 1.6.