# 3.8.7 * Feature #158: Merge 3.8.7 code