Zhu Jinhui 0a31b33423 Merge dev to master 7 lat temu
..
profiles_settings.xml 0a31b33423 Merge dev to master 7 lat temu