Mp limit

image limit parameter
https://www.pivotaltracker.com/story/show/35266615
https://www.pivotaltracker.com/story/show/35266277