Merge "Doc change: Design guidelines update." into klp-dev