refs #502, refs #530, refs #516