Revert 5e3e2d0..d0b8506

This rolls back to commit 5e3e2d03b08e48cc6f628129d48dbb565e86f521.
Merge branch 'devlop' into feature/bird1204