Retrieve Makrus merge

github for internal use