BS-6820, merge fix