Merging last changes from Master (Arabic string included)