merged neon_tulac branch