update stable - merge last fixes for frontend