Localization can have interval as self object
Merge branch 'version-2.1'