Added recent wheel changes from develop branch