Will merge. Fixes values and some test cases.
Make top interaction handle module correctly.

Closes PR 14163.