fix for #4243, adds notification

squashed commits