[FEATURE] Sync changes between the branches and cleanup