Dev

Migrating changes in dev to stable. As no issues with them were found.