fulfilling op desires #40
(cherry picked from commit 3c4d65c)