Merge "Improved tifast.so agent"