Please check issue M-400
http://issues.merchello.com/youtrack/issue/M-400