[BUG #8528] applied patch and added test