..F....... [DEV-536] restored changes made in r47901 and lost in r47926