Added config stage cap
conflict merge