Yesterday
merge from plantpot_extra_inside_checks