Committing the fix for CEP-864,CEP-866,CEP-871