Merge "Removed StageListenerImpl and moved data into StageTaskListener" into main