Version 1.0.6 -- fixed for MW 1.24

Change-Id: I514fcf5226c9f1bb995ff5610d521ad068e4558c