JSS feature merge APU 8064