Adding new rendering event
Merge branch 'develop'