Issue 3005 compile master 2.3