Merge branch 'issues/JAL-3553+JAL-3978+JAL-3989+JAL-4004_merged_with_develop' into...