Some more of commit e68e011621acc8aa09b33ecc2bfc8fe3c3f8eafd