[TO STAGE] Site summit changes

backported from 53624d468f955740945d39cd0809dbc23b3f77ca in
master