closes #6966, #6931, #6930, #6929