Merge remote-tracking branch 'tm/pr/445' into HEAD