modify directory controller
Merge commit 'd95bb037d1e1cac420952ab70256487cd3be3ce4' into develop