Merge "Fix registerListener and flush bugs." into klp-dev