Try to improve timing for show/hide empty
Merge remote-tracking branch 'origin/develop' into develop