Adding fixes for CEP-912 and CEP-915