Merged ae37bb9, resolved conflicts