Merge "KW Warning Fixes"