Merge commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c' * commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c': add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
Merge commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c' * commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c': add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs