Jira2634

closes 2634 and includes 2030, 2016+2282.