Merge pull request #52 from graimundo/5.2

Cherry picked fixes for 5.2