Change GH-333 to reuse the status_mapping
CHANGELOG for GH-340 and GH-333