[1.01] merge of master and luki_jonny (LG,JL)