- move force key checking into a system property (#736)