change method
Merge branch 'master' into platform-example
resolve conflict
Merge branch 'platform-example'
rename hitArea to bounds