Merged WAIVER propagation into trunk and bumped version