Closes #1750
Updated Version 3.0.6.005