BZ-8867 handle open/close