integrate community fixes