Bug 1051679 - Add reclaim support