#5399 by YourMove

#5400 by YourMove