refs #1606 merge with dev && code style