Merge "remove development/data/etc/*"