s4-ldb: merged with master