Merge multiple statement hotfix from master