Merge Things Manager codes CA and Master branch.