Merge "Move to some properties users to libbase properties"