Merge commit '5cfa75875fcb2701fbe3b8cf861c4c1d0e38e5e7' * commit '5cfa75875fcb2701fbe3b8cf861c4c1d0e38e5e7': Fix issue #3108683: GRH18: Battery usage chart FCs
Merge commit '5cfa75875fcb2701fbe3b8cf861c4c1d0e38e5e7' * commit '5cfa75875fcb2701fbe3b8cf861c4c1d0e38e5e7': Fix issue #3108683: GRH18: Battery usage chart FCs