BZR-03052

BZR-03052