Merge "Change iftable to never be null"