Merge branch 'develop' into delrifai/#592_fixes_localisation