- Fixed minor issue
Merge branch 'Releases' into next_release