make automatic lock releases optional and move ceavat section there