WEMO-28191: another commit