merge from monitor page