Move up to the latest updates for 6.1.x metadir feature