(cherry picked from commit bf2246f5)
(cherry picked from commit 27ed656e)
(cherry picked from commit 18ca0210)
(cherry picked from commit 1225dc46)
If there is a folder, the (old) experiment will be registered (cherry picked from commit 288ea4e6)
Update description