solved strange problem due to CompileStatic
Merge remote-tracking branch 'origin/master'