Adding in commits that weren't here from 11b7202ed025c6bde097cbd59a76ea9b6af243d2 on