Merge "Prepare the Manager class for tempest.lib"