Some adjustments
Merge remote-tracking branch 'origin/master'

Resolved conflicts
tobereverted
Revert "tobereverted"

This reverts commit 3b7a42662cab9a0789e01bf5ca11dd19ae86ef25.
Brute force reversion