Fix trendstore in trigger
Merge branch 'develop' into release/4.6