Merge pull request #3141 from neilLasrado/production-planning

Fix - #3123