Merge branch 'develop' into enforce_folder_refresh_even_though_etag_is_not_updated_in_pull_to_refresh