Merge branch 'task/JAL-3796_notarization' into develop