Merge "Improved CdbException handling in LocalisationCache"