Merge UAT version 0.3.2 to master