merged nodb -- public for 'm' fix