Latest commit 2227863 Feb 16, 2017 TK-999 SUS-1646: CR changes