atmire-1691

replaces work in abandoned branch atmire-1920