Merge all changes for STK v2