Update devel branch with latest main code