* PM-19574 * explicitly set true * remove delete cipher call to address the issue at the core separately * add test