Merge "Fixed review comments" into klp-dev