Merge remote-tracking branch 'EXreaction/ticket/11628' into develop