* commit '4991a00b28ea17941681396ec5dfc62a53408158': Review rework for issue 3385068 : Play gets out of sync