Work in progress on merging lolab changes