Resolviing conflicts
Merge commit '830e5562c1461a41927d4fc0fa43f523c962341f'