Revert changes
Changes reversed
Merge remote-tracking branch 'manual/master'