Merge branch 'develop' into 'master'

Cocos fix

See merge request !22
2 jobs for cirunner in 1 minute and 28 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Windows
canceled #505286
Windows10
masterJobWindows

00:01:28

 
  Linux
skipped #505287
BranchJobLinux