deploy_extra_log: Rearrange import callbacks. Move checking to the top.
Merge remote-tracking branch 'origin/master'