TIMOB-16044-Moving the changes to proxy as it already has the lifecycle event handlers