Merge from master: scheduled update of production with recent fixes and features.