minor update to accept placeholder from schema as well
merge remote