-5 merge of '8dc3dbded4d489ddca319052bf3cdb0c4d5a13cc' and 'afcd808741bf31d75eee2639e19d5e8946b62756'