Merge pull request #43 from graimundo/5.2

Cherry picked features tested in master for 5.2