Home update in line with release-v2.1.1