Merge "jpegr refactor: rename namespace"