Merged from production with API views