restore concept 6, merge !93

Steven Siebert requested to merge restore-concept-6 into master Mar 25, 2020