HH-42314 improvements for self.json