Version 2.1 -- fixed for MW 1.24

Change-Id: I5fdc87cf553bd9124d4a9e4577d1e8ae3d6eb851