Closes Feature #1642