Merged the updateCapacity() fix to development