Branch: Development changes

Please verify changes