merge rev 15298 otherwise bwlimit throws an exception