ported the fixes to provisioning from split-planner branch