Add function to API
Merge branch 'render-deregister' into x-display-order
Fix errors
Merge branch 'render-deregister' into x-display-order