Merge "Remove de-funct dynamics support" into devel/master