merge of recent fixes made in release