edited (reverse-merged from commit 9ff4c9927b887164348dcedc35c5effef0e2f2f8)