Merge escAndSideClick into betaTest