[JBJCA-1088] and [JBJCA-1090]