Created by: cvrebert
CC: @mdo for review I'm not sure whether the margins are really related like this or not.