Merge "Exclude charging period when calculate the reattribute duration (5/5)" into main