refs #615, #616, #617, #618, #619, #620, #621