Merge "Refactored area update info support"