Ticket 928 - prevent a CKE during write
merge of '9f901bf6cca59e5a24595ef80a2fbb586e259281'
     and 'e31714127884dc817acde4cf97cb9c7d8cebc92b'