Fixed broker crash null opts
Client finalcb must me explicited
Merge