Merge "Fix JavaScript error after Rendering API clean-up" into devel/master