PS 3.1.4 and AQ 1.0.6 Releases
Merge master into md_sandbox