Merge branch 'stable' into dev/AR-1_serialization
Merge branch 'dev/AR-1_serialization' into stable