apply #533: improve activity display : final merge