Merge "Fix growth limit / footprint limit problems"