Staging -> Master

Merge PR 1664 to master.