Feature/5706

Feature 5706, following features 5705, 5704