JAL-1065,JAL-1066 - propagated 863467bf6c59c0bc5368c8f3a03d9d5a4f10700d to refactored...