Applying fixes from Development branch