sync with develop, fix skipping condition