Merge changes from topic 'euphrates-sync-2017-10-18' into stable/euphrates