Merge "Fix Kloc issues." into devel/master