Changes to features-rest from latest master pull