Merge "Update comments" into klp-dev