Revert "merging feedback and om"

This reverts commit 93d8300d0d4f5b19cd3cbc159fe738cfa299a170.
Revert "merge feedback and om"

This reverts commit cc465a27e77cd68bdfa04632fc7f2427a65708e9.
feedback file, ignored: true