Merge remote-tracking branch 'origin/master'

Changes required for testing the application