[master] Some cleanup + some job on action server error handle