merged MH-816 (status action) into master