Development to Master

Preparing next PR for Hotfixes and Updates. Changelog will be added once ready.