Version 3.1 maintenance update