Merge branch 'bug/JAL-3849_aacon-parameters' into improvement/JAL-3848_slivka_0.8