Merge of develop to master for 4.1