task #035-Site_changes_block: Minor fix.
Merge branch '035-Site_changes_block' into develop