2_1_4 updates

Signed-off-by: Jono Herrington <jono@numinix.com>