Auto686

Fix AUTO-686 and fixed merge conflicts