post-merge check17