copy changes based on :
CAMP-142 Q1 Connected Home Part 2 v4

Signed-off-by: franszo <franszo.design@gmail.com>