MswRollUp: Start of fix of static well calculation
This is an intermediate commit and does not compile
p4#: 22221