Internal commit with scattered changes