Feature/now 444

See individual checkin comments for what changed. This should resolve NOW-444 and NOW-380.