Transfer PR for Luiz over to ctb repo