Merge changes from other project (ARC and few other tweaks)