Rolling up changes from devel branch