Merge accepted alpha-next development line