Request merge for two functionality issues