Revert "various changes"

This reverts commit e98a5cd0412986f40b5611df09d4eb96b1a1171d.
various changes
Merge commit '56b8ade5f886fa1d1f6980d7aeac79db9e9dff7c'