Minor version update
Manual merge of changes