task #00024-Global_styling: Search address block fix
Merge branch '00024-Global_styling' into develop