a step toward #1155 #1176

Closed belforte closed 9 years ago