Bug fix 1
Bug fix 2
Bug fix 3 added
Merge branch 'releases/r1beta' into dev