#1845: #1827: implemented changes per PHS

opened by thuchacz