NAL-474: Migrated changes from branch nal-474 into new branch nal-474-update in order to resolve conflicts