20042: Metadata for all: Bug fixing round 3