M1453: Included unaddressed review comment r/3291