Updating localization based on feedback.
#MBL-10677
#MBL-10678
#MBL-10687