Reviewed-by: lmesnik, dholmes
Reviewed-by: cjplummer
Reviewed-by: dholmes, coleenp, mseledtsov, lfoltan