Updates Development Branch with latest fixes from Master

Master is ahead as some progress hasn't been pulled to development first.