Fix build
Merge remote-tracking branch 'origin/develop' into 264_sharedpref_string_set