Merge branch 'jk/unavailable-can-be-missing'