Merge remote-tracking branch 'origin/Applications/16.08