Merge "Let handler perform input layer creation." into main