Feature/nge 17 skip reg questions