Changes for testing 3.2.3