Merge branch 'pathc_JAL-1354' into develop