BAP-5285
- stabilization