[H000206] Harkin (Fixes #515), [M001183] Manchin (Fixes #494)