Merge commit '802f58da80debfc425039259e6dfd042db66ce0a' * commit '802f58da80debfc425039259e6dfd042db66ce0a': Add AGGREGATION_INTERVAL_SECONDS (fixing the build)
Merge commit '802f58da80debfc425039259e6dfd042db66ce0a' * commit '802f58da80debfc425039259e6dfd042db66ce0a': Add AGGREGATION_INTERVAL_SECONDS (fixing the build)