v1.6.1 (final-review-fixes)