Version 2.2.4 -- fixed for MW 1.24

Change-Id: I089b1351e7e9d452b389e272b4130aefdd381844