JJ-0632-merged