Merge branch 'nfp-flower-speed-up-stats-update-loop'