Reports-167: Merged upstream and pushed