Revert "Files from development branch merge"

This reverts commit 5d5884494f8edfad00eaccdf619a41f494185624.