Closes #2269
Updated Version 3.3.012