Sync with v0.99.2 from Bioc