refs #1214 Change-Id: Ia382acad6c8eeac85663fd664d1d34ba6f2ad478
refs #1309 Change-Id: I6fd8efdfc98175a1cc39fdc3aa7175671596f470