another temp commit with fixes for PUP-266