DocCode: cosmetic changes to metadataOnClient