Kingfisher

Respect layout behavior when explicit placeholder is given

#1975

Merged