Manage issue [#2018] and miscellaneous changes.