Moved misc from Stand-alone into master
.