Updated PR - Fixed wrong call trigger after render component #2095 by brunobatista
Fixes #4009