Merge "These moved into developmnet samples"