#5297 Implement monitor feedback, Add corresponding tests