Issue #PlUS-1317