Merge branch 'rr/ignoredandderived'