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