fixes for feature_f pulled out of release branch which is merged to master