Pull in firstPlay fix from stable (2.1.x)

Should be pulled as this is also an issue on master - see #616, this PR supersedes #617