Merge "Changes list legend modules cleanup"