Inline with kul master changes