refs #1345 #1255 Change-Id: If1cfc26049f87318103fc09c3b211ebf1eb3ebaa
refs #1214 Change-Id: Ia382acad6c8eeac85663fd664d1d34ba6f2ad478