BAP-6861: Code review changes