merge from dmur/Skeleton