#562 - skip logic mode selector functionality implemented