manual merge of chrisalcantara PR 13