7b0fb2a1e3
6970683 and 6953144 introduced changes that need to be implemented for Zero and Shark. Reviewed-by: twisti
6970683 and 6953144 introduced changes that need to be implemented for Zero and Shark. Reviewed-by: twisti