Merge "Change ApplicationEvent for ModelLoading"