P0WER-11471

P0WER-11471