Fix WEA-281
Fix WEA-283
Fix WEA-282
Fix WEA-284
Fix WEA-279
Fix WEA-285