merge nested warden into master

merge nested warden into master